Style tweak
Tighten up function check