Code cleanup
Code cleanup

jasonchaffee/stubby4j,jasonchaffee/stubby4j,alenkacz/stubby4j,jasonchaffee/stubby4j,azagniotov/stubby4j,azagniotov/stubby4j,azagniotov/stubby4j,alenkacz/stubby4j,azagniotov/stubby4j,alenkacz/stubby4j