Small refactors
Mergei commit