Code cleanup

Code cleanup after validating html at http://validator.w3.org/