Code cleanup, added build.js