more refactoring & elevator commands