code cleanup the first act