diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 5ba1433..4364cb0 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,32 +1,14 @@
 # Please describe your issue
 
-## Is this a bug, an improvement, a proposal or something else? 
-
-- [ ] Bug
-- [ ] Improvement
-- [ ] Proposal
-- [ ] Something else
-
-
-## Briefly explain your issue
+### Is this a bug, an improvement, a proposal or something else? Describe it.
 
 ...
 
 
-## What's the expected behaviour? 
+### What's the expected behaviour, the current behaviour and the steps to reproduce it?
 
 ... 
 
 
-## What's the actual behaviour?
-
-...
-
-
-## What are the steps to reproduce the actual behaviour? 
-
-...
-
-
-## Comments
+### Comments
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f5504a0..046a406 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,26 +6,18 @@
 - For changes and improvements, new tests have to be provided to cover the new features.
 
 
+## Is this a fix, improvement or something else?
+
+...
+
+
 ## What does this change implement/fix?
 
-... *answer here*
+... 
 
-## Is this a fix or an improvement?
 
-- [ ] Fix
-- [ ] Improvement
+## I have ...
 
-## Have discussed this change in an issue?
-
-- [ ] Yes
-- [ ] No
-
-## Was some test failing because of this issue or change needed?
-
-- [ ] Yes
-- [ ] No
-
-## Are you including tests to cover this change?
-
-- [ ] Yes
-- [ ] No
+- [ ] answered the 2 questions above,
+- [ ] discussed this change in an issue,
+- [ ] included tests to cover this changes.