Re-work for HTML part. 3/3. Refactoring complete.