Cleanup

General clean up and code formatting