changed some programming style issues
changed some programming style issues