Silly refactor-o