Cleanup indentation and update reflection