Consistent indentation
Minor improvements