2 spaces for tab, clean up all code