Cleanup
Fixes & Cleanup