Refactor: make class fields private