comments free
Deleted unused variables
Added validators for command options