Small code improvements
Small code improvements