Refactoring and some optimization.