Fixing identation and formatting