changes asked by @Arnavion after review