Make fields private again