AT: changed event fire calls into method calls. Cleaned up code.