Added local momentjs / refactoring