source-format #1 

3.0 (native)
# Change User Description Committed
#1 18730 Liz Lam clean up code and move things around