* some code cleanup (after linting)