code cleaning - continue