Cleaned up code, reformatted and deleted unnecessary files.