Moved constants into grunt file & fixed some warnings