refactoring + added note to self