Address comments + detail implementation a bit