Minor changes visibility/final