Fixed first part of exercise to follow better paradigm