Shorter diff functions

shorter and more simple