Refactored move, adjusted dox