miscellaneous dev cleanup
miscellaneous dev cleanup
#137: closes