Micro challenge refactor

Updated micro challenge after code review.