tidy source up a bit