DEV: small format changes