Reafactored Code with interactive rebase 3