Cleaning the code

TODO: Move code formatter to utilities