More Styling

Improved Aesthetics and code semantics.