Small cleanup of module coverage and style changes

Next related pull request will big one, so I've splitted to several.