Implemented comments from @keflavich