A little cleanup, syntax, etc.