Cleaning up @rBatt code.