Minor reorganization/cleanup