Made some changes to force better vim habits.