fix indentation and nitpicks