Code improvements
Code improvements