Incorporating a few more cleanup items from jvazquez