better formatting on models