master: fixed remaining formatting issues