Formatting cleanups and simple stuff

Change-Id: Ica8298353be22f947c8e8a03d8dc29ded9cb26dd
Merge branch 'functions-update' into dt-test
Merge branch 'pretty-up' into dt-test