Simplify stuff
Merge pull request #1 from M3gaFr3ak/master

Simplify stuff