Reduced dependencies and improved command-line arguments