Some code improvements
Code improvements
Code improvements