Remove whitespaces and fix indentation