Removed strange decorator usage