Added style + indent rule, fixed some indenting as well