Minor structure changes [#43]