some little more code cleaning