Tab indents removing and refacoring