Minor change: separate sections; add markup to variables