Prefix whalecat internal function with underscore
Refactor whalecat