Mid clean/refactor