WIP. Autoformat code to new standard.