Reorganize val declarations to be clearer
Raise margin factor to fix fail of CI build