Revert "Code updated according to Coding Guidelines"
Merge pull request #287 from GreatDevelopers/revert-286-dirty

Revert "Code updated according to Coding Guidelines"