Refining. Now passing http://validator.w3.org/check
In the middle of refactor, commit to be able to read code home