Replaced Ghost Hawk with the Hellcat

Also cleaned up the code.