Cleaned up some CLI args