Indentation and clean-up