Minor fixes + indentation