Refactoring and beautifying the source code :)