continuing cleancoding..