Cleanup of code, added in loading of collision objects