Fix based on peer review & code improvement