change naming and reformatting