Fixed formatting, unified shields