Silly refactor