Refining some code

That.