refact Amida class