added better formatting