Cleaning up, refactoring and adding things like additional console.logs