Replaced the Ghost Hawk with the Hellcat #2

Also cleaned up the code.