use properties instead of methods
remove unused code