Blacklist and Whitelist refactored plus code fomat