minor coding style issues resolved