just a few improvements...
not sure what happenend ;) just refactoring