removed coding-guidline issues