Formatting & some code cleanup.
Formatting & some code cleanup.


SVN revision: 42726

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