cleanup

tab and some fix