Fixed typos, removed empty elsif branches.