code cleanup & organization