Some little refactoring to please nazi std :)
Merge pull request #29 from Kenny9999/master

Little refactoring