name cleanup
added if expression