Addressed more @natefinch comments