Refactorings removing redundancy
Cleanup (#111)