cleanup

tab and some