cleanup handling of None tests
cleanup type handling
gl organization cleanups