did ctril-shift-f and tidied up magic constants