time class
refactoring current time
bug fix