did ctrl-shift-f and more removal of magic numbers