cleaned code -- removed commented out code