fixup! Correct style and add first rules