Fixed some losts changes caused by the recent merge

Some minor enhancements to previous merge

Fixed indentations