Started on cleaning up the whole project