Quick code cleanup