Fixed formatting and var names.