Github comments addressed