Refactor classes to not use propreties