Style cleanup

#637 with latest development code.