Better styling (more Credo-like)