Neatness fix