Run Format On Source

Cleaned code + used format on the code.