fix smells in code