Prettied up some more constants :)