Resolved issues with coding standards