Improve

A little improve to the code.