Text indentation enhacements

Indentation fixes & improvements,
Code re-organized