Fixed short options.  Minor code cleanup.