Cleaned up my project