small bugfix
code cleaning