Splitted handle method to lower code complexity and removed useless if-statement
Merge branch 'master' of github.com:ZimonD/ContextCG7