Tabified and cleanup up comments