Some cleaning. Tests doesnt pass but its ok to work on