tweak var naming
add moment js