more reformatted code