finished code quality and smells