Fixed taonum issue and cleaning up