Fix whitespace and remove some console.logs