Cleaning up commented out lines, fixing pid location