refactor code

* use "." syntax to access instance properties
* kill more `deprecated` warnings