Fix up some formatting and var naming

Changes to add threaded workers and customization for event filtering coming right up.