A few basic cleanups

Basic cleanups to get into the flow of things.