apply @fpytloun comments
3 files changed