fixing tab width
Cleaning up some garbage