Tons of refactoring, removed all found dummies