Clean upped a bit