Changed collision class and clean up a bit. AH-214

The Collision class now has static functions static.