Minor indent and refactor