Refactor, elegantify