Change priorities
Whitespace/indentation cleanup