Some refactoring to make it pretty. ;O)
Some refactoring to make it pretty. ;O)