input parsing - improvement