Cleanup and clarity