new coding standard + code refactoring