Remove unnecessary strings and shift declarations after argument count check