remove some code-smells