Minor cleanup, comments