Remove unused condicional
Add diff context lines and change diff logic (weird cases still happening)