Code Cleanup.. aka, I left some commented code in