Minor: refactor, indent, comment