Lots of cleanup and standardization
Revert "Shorter ga dimension check"

This reverts commit 8c1d05a4eba82f22e56fb880d479c51bcb0b20ac.