Feature and minor changes -refs #6746

Changed Tab identation by 4 spaces