Some fixed with indents and logic.