Refactor baby