Refactoring using runnable's