Better helpers
Finished week 4.