Cleanup and coding standards