Code quality increases on eligible_object class

Hi Andy and Rodrigo, 

Just met with Kat at Fulton yesterday! Been digging deeper and made a few more code quality tweaks:

https://docs.google.com/file/d/0B1FYVlu0Fh9fNndIT2M0dFdURUE/edit

Cheers,
Janet