Winforms test app, refactoring