Minor refactoring + New argv[1] length check