Defined Collision Distance

Added a define for the collision distance in the collision avoidance
code; also formatting fixes