Cleaned up collision and merged it into Game class