#359 - no longer requiring Now when raising events
#359 - refactoring and cleaning up touched files