Fix for #28 and additional clean-up

Finally found the lines of code causing this moment.js depreciation warning!