comments and format cleanup