Micro challenge refactor