Remove overingeneering
Refactoring some stuff