Cleaned most of the code formatting