This should fix all known bugs, make the code easier to read and more
robust.