changes file reordered and standardized