Cleaned up some files and code