Some style changes: one space after switch and a huge number of increments