Code clean

Just like in title of this PR.