One last style tweak...seriously done for now