More refactoring + notes for future me