Cleanup and clarity

These changes are for cleanup and clarity.