Increase default mbuf size and code simplification/cleanup