Code cleaned & sorted
Merge pull request #1 from Nurislamov/master

Code cleaned & sorted