General code cleanup (consistency++)