Cleaned up project