Use more descriptive underscored variable nameing
Reorganize spec helpers