Reorganized header structure, comments, extracted mixins/vars