improve code readability in a couple of places
initial interface injection