Refactor: re-indent code