A few QOL changes including indentation.