Refactoring and Fixing bug