Refactored fields and moved methods