Cleaned up some style, fixed typo, and changed order of build and requirejs definitions