Fixed lint errors, standardized "using" usage, swapped header order to make a bit more sense.