Removed moment

Momentjs is not needed at the moment.
General extention of the code