Code-refactor from last nite