Cleaning old box pass for easier translation. Again, this loop confuses me. Some other general clean-up.