These constants are in the header, let's make them static

So they can't be viewed from outside. Not needed to be viewable.
Removing BVA redundant enhancement. It gave errors