code refactor, 15:49