Cleaned up a little. For #48.