Module reformatting: Split one-line blocks and var declarations