"Refactoring"… and more style changes #jumpy