Fix Clyde;)
add suggested code improvement