More source formatting