Code cleanup after merging pull request