renamed some methods to follow c++ conventions

also removed collision method because it wasn't being used