Clean up whitespace and remove console debug statements