WN: Complete initial review of macro-level. Also untabify.