FIX: Make fields private where possible