cmake cleanup formatting and variable names