Clean Up and Performance ++