Be more verbose on demand

Better mehod naming and null handling