Aestetics and formatting cleanup
Aesthetics and cleanup