W3C Validation (part 1,5)
Refactoring