Finished cleanup of 'Helpers' namespace