Added Changes to Style

Cleaned the code and format.