Refactoring after code analyzing.