Did s'more refactoring.