Refactor killed me