Address codahale's and philpennock's feedback