refactor codestyle (chaining)