Better style. Closes #7.