Refactoring, removed unnecessary lines.