Fixed Bug & Cleanup