No, I'd prefer it the way it is. I have a plan to introduce sass, so the duplication of the styles can be solved later using that.