fixes, code cleaning