improve layout
cleanup