Stylistic changes

how will this merge with the other changes i wonder