cleaned up main class and _args stuff