Updated to use helper methods
Completed section