formula cleanup and (maybe) fix obelisk