finishing cleancoding, ready to merge