formatting updates
merge is being stupid :(