Cleaned up project

Cleaned up project