Just Some Code Cleanup