Comment cleanup/code reorganization