reorganization
option parser improvement