Improved a bit on the code readability.