Cleanup, tweaks

Added namespace for helpers, fixed code spacing