- Minor code cleanup and reorganization