updated project and removed redundancies etc