[FIX] Quick Fix

Quick Fix and code cleanup