Cleanup

Cleaned up some files to make them ready for editing