some refactorings
fixes 101companies/101wiki#203