Code clean

Re propose in one commit