Implemented indentation option
Some fine tuning