Unify fourcc macro and some style changes