Refactor in quest for beauty