Fix after review of declaration chapter