Cleanup

Basic cleanup and tidy for development.