Beautifyinteg

Should be mergable is I didn't screw it up while rebasing.