Formatting. Remove some duplicate code.
Formatting.
Remove some duplicate code.


SVN revision: 42717

tasn/elementary,FlorentRevest/Elementary,rvandegrift/elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,FlorentRevest/Elementary,tasn/elementary,rvandegrift/elementary,rvandegrift/elementary,tasn/elementary,rvandegrift/elementary,tasn/elementary,tasn/elementary