I hope the last style cleanup