Flushed out elevator class more