Address final GitHub comments