Removing console.logs and cleaning up