Cosmetic changes + windup servlet

Originally, this was just few changes to the code, please review those.
And since I worked in master branch, the windup servlet module is in the same pull request.
I may split if necessary.