Refactor model

-Replace empty normalize with input
-Enhanced diff tool
-Enhanced Edit Address method