Add some code improvements

nothing special