Code indenting and tabbing cleanup