small improvements to code
small improvements to code