Refactor / re-indent complete.