standardize format spacing; tidy code