gs/ap - clean up code tabbing