Removed unnecessary goto, vi-mode improved