Fix formating and one notice