Refactored to use momentjs more - cleaner