Cleaned up some interface references

Just some small changes to cleanup where the ItemReader/ItemWriter interfaces are used