Refactored keeper code to be more oo