Fixing indentation and style