Fix spaces
Fix naming and cast to bool