Cleanup based on feedback from agibson