Fixing indentation and spacing problems