Cleaned up rspec
strftime formatted
more strftime formatting