Cleanup

* Re-indented code