changed tab size from 2 to 4 and cleand up some unused code