Issue 46

So you're still fixing these cosmetics right? Since you got these in twice now, I'd just do them as separate commits so you're done with it...