Some minor cleanage
Same