code formatting modified in EventHandler and Singleton projects