Code cleanup (re-indent)