Moved helpers out of registry and cleaned up default settings