Minor refactoring.
variables changed from public to private
removed too long strings
renamed StorageManager -> DataStorage