Code cleanup, and the red highlighting of acid should work now