combined some loops over collision list into single loop by moving draw and cleanup into collision.detect