Make interface nicer