Started cleaning up html