Starting to clean up code
More cleanups