Cleaned up whole project