Refact based on code analysis result.