:bug: FIX & Refoctoring