Initial code cleanup