Lines of code have been reduced while know bug has been fixed as well as improving readablilty. :)