Very minor simplification, added moment.js