Fixing thing, code cleaning