Address todo comments from refactoring

This contains changes being ported from #96