Code Cleanup

Spacing and formatting