Changed "ugly" formating