Tommy Leedberg - Just some code cleaning to make it more readable