Even more formatting fix and helpers