Style fixes + Index re-order