Style changes
attempting to merge all this together
attempting to merge all this together