Minor code simplification
Minor refactoring
Move command-line options parsing to Main