user interface cleaned up