Small changes
Improvements
Finalization