Fix style error and change visibility