Fixed moment.js, code cleanup