Small refactoring + installed Winsdor