Code Cleanup

Removed some duplicate code through decomposition.
Code Cleanup

Remove duplicate boolean
Merge pull request #102 from Skylion007/master

Code Cleanup