Simplify conditional logic around func, normalize code style

[paulirish]

Gonna drop this for now.. Don't think its a considerable improvement for readability... but open to further PRs to improve things.