code cleanup after pull request