Cleaned up and updated project