code cleanup (the missed part)