Basic Cleanup

Cleaned up and neatly formatted the code