Modernized funnel codebase

About time Funnel caught up with the rest of the HasGeek coding style.