Code clean-up Topologie-package