Follow up in code after review