Refactorings

tnc-ba/strongTNC#110