Major cleanup in alias chapter
Cleanup in methodology chapter