Code clean up, removed console.logs and ;