code cleanup for CustomerActivity