refactor last commit to make more concise/readable