Fix various minor formatting issues

Closes #242.