cleanup of structure and comments