Code Cleanup - Yay