Cleaned up collision stuff