cleaned some things up (void and unless)