Sligthly better formatting