Minor refactor for readability. #9