Remove old tab code
Minor formatting changes