Minor indentation and ordering fixes