Clean the code and make it more clear
Merge pull request #192 from Psyker/master

Clean the code and make it more clear