More readable markup + clarification