test on ruby 2.1.1
code cleanup