Try to indent and correct some features

Didn't accpet by FA... I may have strike something.