code refactor (exactly same output as the previous revision)