Refactoring - parseInt(Date.now(), 10) => time()

r? @ametaireau 
Oh, we should be more consistent then;

Sometimes, the variable containing the result of the call is named "currentTimestamp", and sometimes "now". We need to chose one name and stick to it (whatever the name is, now is fine since we're using it at multiple places).