made more changes to coding style