reordering CSS; changing comments, some one-liners