Improving the indentation
Adding two more categories