Some minor formatting, commenting