A bit of code clean up (problem now has a private reader class)