Made fields private. Renamed constants.