refactored fields declarations - made some of them final