Implemented: minor modifications due to review feedback