improved rules compliance and code coverage