small fix

fix date & refactored variables