restructuring some things to follow a more standard format