CLeanups and comments