Cleanup of collision detector, based on checkstyle