code style, removed deprecated method calls