Cleaned and geared up Colliders

Signed-off-by: Schobben Thomas <schobben.thomas@gmail.com>