Trying to improve formating