* code cleanup (according to PBP)