Started cleaning up the project