code cleanup
Merge branch 'better_spec'