Updating the project to a cleaner code. Created a little bit more of a ditin