Like the title says, just cleaned it up a bit while trying the code. Feel free to merge if you want :)
Best regards
marcelo-s