code cleaning - continued