Decreased indentation by one level
Clean up and improved readability