Remove gross wrapper and fix indents.