Fix properties and use them throughout class