Improved the code, a little bit.