Finalized project

Code clean up
Finalized