Remove unnecesary if
Mark Objective pre_save helpers as protected
Change iterator name in Objective pre_save
Make objective edit code test more readable