Refactor, indent
Minor: more telling name and use val