Fixed @smarterclayton's comments from #384 part 2