Fix up some formatting and var naming