minor cleanup
introducing properties