Trying to clean up readability a bit on this after debugging when there
was no problem...