Added require for timestamp.rb
Refactoring