Update code style

It's been about a year since I last worked on this code… Now I've decided
that I don't like the Java-ish style that I used to use. Lets fix that up.