Refactor as a Maid Class and add some comments