moving comments and remove define
adding command line option handling