Switching to GetOpts
Removing commented code