Changed formatting and using moment.js