Code clean up

Formatted all code