Use more descriptive method nameing
Adjust specs for prior commit