acu164602 Cleanup variables as well a bit