integrated @ratrun suggestions in #190