Small Cleanup
References #377