Minor formatting fixes and comments