[CLEANUP] Code-Cleanup