Change `then' operator
Rename
Remove unnecessary setup