> Regarding the style, I just shuffled code around, it was like that ;)
It's probably stayed since initial project prototyping. New code (including refactored) must confirm the new defined style.