- Reused contains() from utils.go at a couple of places - Cleanup in return statements and boolean checks
thx to @MartijnVogel_twitter