Did somebody say refactor?