Remove extra spacing and fix indentation