Refactoring - compliance to library coding standard.