Bug:Fix Refactor double lines