made changes to meet code style guidelines