Fixing indentation and formatting problems