Minors: add fixes to antipaterns

I am still making some antipatern mistakes, actualy the client has lots of this
a will continue to remove some of them frequently.