Cleaned up project code